Autogenerated HTML docs for v1.8.3.2-804-g0da7a
diff --git a/RelNotes/1.8.4.txt b/RelNotes/1.8.4.txt index 0e50df8..4250e5a 100644 --- a/RelNotes/1.8.4.txt +++ b/RelNotes/1.8.4.txt
@@ -79,6 +79,13 @@ UI, Workflows & Features + * "gitweb" learned to optionally place extra links that point at the + levels higher than the Gitweb pages themselves in the breadcrumbs, + so that it can be used as part of a larger installation. + + * "git log --format=" now honors i18n.logoutputencoding configuration + variable. + * The "push.default=simple" mode of "git push" has been updated to behave like "current" without requiring a remote tracking information, when you push to a remote that is different from where
diff --git a/cmds-mainporcelain.txt b/cmds-mainporcelain.txt index 84602e9..4017dab 100644 --- a/cmds-mainporcelain.txt +++ b/cmds-mainporcelain.txt
@@ -71,7 +71,7 @@ Add or inspect object notes. linkgit:git-pull[1]:: - Fetch from and merge with another repository or a local branch. + Fetch from and integrate with another repository or a local branch. linkgit:git-push[1]:: Update remote refs along with associated objects.
diff --git a/diff-options.txt b/diff-options.txt index 19f78a7..87e92d6 100644 --- a/diff-options.txt +++ b/diff-options.txt
@@ -333,7 +333,7 @@ a fraction, with a decimal point before it. I.e., `-M5` becomes 0.5, and is thus the same as `-M50%`. Similarly, `-M05` is the same as `-M5%`. To limit detection to exact renames, use - `-M100%`. + `-M100%`. The default similarity index is 50%. -C[<n>]:: --find-copies[=<n>]::
diff --git a/git-clone.html b/git-clone.html index 3c8a73f..78d7d33 100644 --- a/git-clone.html +++ b/git-clone.html
@@ -1013,12 +1013,13 @@ <p> Create a <em>shallow</em> clone with a history truncated to the specified number of revisions. A shallow repository has a - number of limitations (you cannot clone or fetch from - it, nor push from nor into it), but is adequate if you - are only interested in the recent history of a large project - with a long history, and would want to send in fixes - as patches. + number of limitations (you cannot clone or fetch from it, nor + push into it), but is adequate if you are only interested in + the recent history of a large project with a long history. </p> +<div class="paragraph"><p>Pushing from a shallow clone should be avoided if the git version on +the receiver end is older than v1.7.10, or any other git +implementation that does not perform connectivity check.</p></div> </dd> <dt class="hdlist1"> --[no-]single-branch @@ -1289,7 +1290,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-07-01 14:29:27 PDT +Last updated 2013-07-12 15:46:35 PDT </div> </div> </body>
diff --git a/git-clone.txt b/git-clone.txt index 450f158..85769b8 100644 --- a/git-clone.txt +++ b/git-clone.txt
@@ -182,11 +182,13 @@ --depth <depth>:: Create a 'shallow' clone with a history truncated to the specified number of revisions. A shallow repository has a - number of limitations (you cannot clone or fetch from - it, nor push from nor into it), but is adequate if you - are only interested in the recent history of a large project - with a long history, and would want to send in fixes - as patches. + number of limitations (you cannot clone or fetch from it, nor + push into it), but is adequate if you are only interested in + the recent history of a large project with a long history. ++ +Pushing from a shallow clone should be avoided if the git version on +the receiver end is older than v1.7.10, or any other git +implementation that does not perform connectivity check. --[no-]single-branch:: Clone only the history leading to the tip of a single branch,
diff --git a/git-config.html b/git-config.html index dc4907b..22fe946 100644 --- a/git-config.html +++ b/git-config.html
@@ -1090,20 +1090,11 @@ <em>git config</em> will search for configuration options:</p></div> <div class="dlist"><dl> <dt class="hdlist1"> -$GIT_DIR/config +$(prefix)/etc/gitconfig </dt> <dd> <p> - Repository specific configuration file. -</p> -</dd> -<dt class="hdlist1"> -~/.gitconfig -</dt> -<dd> -<p> - User-specific configuration file. Also called "global" - configuration file. + System-wide configuration file. </p> </dd> <dt class="hdlist1"> @@ -1120,11 +1111,20 @@ </p> </dd> <dt class="hdlist1"> -$(prefix)/etc/gitconfig +~/.gitconfig </dt> <dd> <p> - System-wide configuration file. + User-specific configuration file. Also called "global" + configuration file. +</p> +</dd> +<dt class="hdlist1"> +$GIT_DIR/config +</dt> +<dd> +<p> + Repository specific configuration file. </p> </dd> </dl></div> @@ -1133,6 +1133,9 @@ file are not available they will be ignored. If the repository configuration file is not available or readable, <em>git config</em> will exit with a non-zero error code. However, in neither case will an error message be issued.</p></div> +<div class="paragraph"><p>The files are read in the order given above, with last value found taking +precedence over values read earlier. When multiple values are taken then all +values of a key from all files will be used.</p></div> <div class="paragraph"><p>All writing options will per default write to the repository specific configuration file. Note that this also affects options like <em>--replace-all</em> and <em>--unset</em>. <strong><em>git config</em> will only ever change one file at a time</strong>.</p></div> @@ -5855,7 +5858,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-07-03 17:43:56 PDT +Last updated 2013-07-12 15:46:35 PDT </div> </div> </body>
diff --git a/git-config.txt b/git-config.txt index fbad05e..99dc497 100644 --- a/git-config.txt +++ b/git-config.txt
@@ -206,12 +206,8 @@ If not set explicitly with '--file', there are four files where 'git config' will search for configuration options: -$GIT_DIR/config:: - Repository specific configuration file. - -~/.gitconfig:: - User-specific configuration file. Also called "global" - configuration file. +$(prefix)/etc/gitconfig:: + System-wide configuration file. $XDG_CONFIG_HOME/git/config:: Second user-specific configuration file. If $XDG_CONFIG_HOME is not set @@ -221,8 +217,12 @@ you sometimes use older versions of Git, as support for this file was added fairly recently. -$(prefix)/etc/gitconfig:: - System-wide configuration file. +~/.gitconfig:: + User-specific configuration file. Also called "global" + configuration file. + +$GIT_DIR/config:: + Repository specific configuration file. If no further options are given, all reading options will read all of these files that are available. If the global or the system-wide configuration @@ -230,6 +230,10 @@ file is not available or readable, 'git config' will exit with a non-zero error code. However, in neither case will an error message be issued. +The files are read in the order given above, with last value found taking +precedence over values read earlier. When multiple values are taken then all +values of a key from all files will be used. + All writing options will per default write to the repository specific configuration file. Note that this also affects options like '--replace-all' and '--unset'. *'git config' will only ever change one file at a time*.
diff --git a/git-diff-files.html b/git-diff-files.html index fec853d..4601ff8 100644 --- a/git-diff-files.html +++ b/git-diff-files.html
@@ -1276,7 +1276,7 @@ a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes 0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is the same as <code>-M5%</code>. To limit detection to exact renames, use - <code>-M100%</code>. + <code>-M100%</code>. The default similarity index is 50%. </p> </dd> <dt class="hdlist1">
diff --git a/git-diff-index.html b/git-diff-index.html index a2c66ae..36e8eb7 100644 --- a/git-diff-index.html +++ b/git-diff-index.html
@@ -1277,7 +1277,7 @@ a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes 0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is the same as <code>-M5%</code>. To limit detection to exact renames, use - <code>-M100%</code>. + <code>-M100%</code>. The default similarity index is 50%. </p> </dd> <dt class="hdlist1">
diff --git a/git-diff-tree.html b/git-diff-tree.html index a211dac..4baec20 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html
@@ -1278,7 +1278,7 @@ a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes 0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is the same as <code>-M5%</code>. To limit detection to exact renames, use - <code>-M100%</code>. + <code>-M100%</code>. The default similarity index is 50%. </p> </dd> <dt class="hdlist1">
diff --git a/git-diff.html b/git-diff.html index 0c51bf0..909183a 100644 --- a/git-diff.html +++ b/git-diff.html
@@ -1377,7 +1377,7 @@ a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes 0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is the same as <code>-M5%</code>. To limit detection to exact renames, use - <code>-M100%</code>. + <code>-M100%</code>. The default similarity index is 50%. </p> </dd> <dt class="hdlist1">
diff --git a/git-format-patch.html b/git-format-patch.html index b79ba30..2dea9af 100644 --- a/git-format-patch.html +++ b/git-format-patch.html
@@ -1134,7 +1134,7 @@ a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes 0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is the same as <code>-M5%</code>. To limit detection to exact renames, use - <code>-M100%</code>. + <code>-M100%</code>. The default similarity index is 50%. </p> </dd> <dt class="hdlist1">
diff --git a/git-log.html b/git-log.html index 7dee93e..ae03ab3 100644 --- a/git-log.html +++ b/git-log.html
@@ -3129,7 +3129,7 @@ a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes 0.5, and is thus the same as <code>-M50%</code>. Similarly, <code>-M05</code> is the same as <code>-M5%</code>. To limit detection to exact renames, use - <code>-M100%</code>. + <code>-M100%</code>. The default similarity index is 50%. </p> </dd> <dt class="hdlist1">
diff --git a/git-name-rev.html b/git-name-rev.html index ab48d69..fb9e0a3 100644 --- a/git-name-rev.html +++ b/git-name-rev.html
@@ -793,8 +793,10 @@ </dt> <dd> <p> - Read from stdin, append "(<rev_name>)" to all sha1’s of nameable - commits, and pass to stdout + Transform stdin by substituting all the 40-character SHA-1 + hexes (say $hex) with "$hex ($rev_name)". When used with + --name-only, substitute with "$rev_name", omitting $hex + altogether. Intended for the scripter’s use. </p> </dd> <dt class="hdlist1"> @@ -859,7 +861,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-07-01 14:29:27 PDT +Last updated 2013-07-12 15:46:35 PDT </div> </div> </body>
diff --git a/git-name-rev.txt b/git-name-rev.txt index 6b0f1ba..15b00e0 100644 --- a/git-name-rev.txt +++ b/git-name-rev.txt
@@ -32,8 +32,10 @@ List all commits reachable from all refs --stdin:: - Read from stdin, append "(<rev_name>)" to all sha1's of nameable - commits, and pass to stdout + Transform stdin by substituting all the 40-character SHA-1 + hexes (say $hex) with "$hex ($rev_name)". When used with + --name-only, substitute with "$rev_name", omitting $hex + altogether. Intended for the scripter's use. --name-only:: Instead of printing both the SHA-1 and the name, print only
diff --git a/git-p4.html b/git-p4.html index 326195d..011332f 100644 --- a/git-p4.html +++ b/git-p4.html
@@ -952,17 +952,18 @@ subsequent <em>sync</em> operations.</p></div> <div class="dlist"><dl> <dt class="hdlist1"> ---branch <branch> +--branch <ref> </dt> <dd> <p> - Import changes into given branch. If the branch starts with - <em>refs/</em>, it will be used as is. Otherwise if it does not start - with <em>p4/</em>, that prefix is added. The branch is assumed to - name a remote tracking, but this can be modified using - <em>--import-local</em>, or by giving a full ref name. The default - branch is <em>master</em>. + Import changes into <ref> instead of refs/remotes/p4/master. + If <ref> starts with refs/, it is used as is. Otherwise, if + it does not start with p4/, that prefix is added. </p> +<div class="paragraph"><p>By default a <ref> not starting with refs/ is treated as the +name of a remote-tracking branch (under refs/remotes/). This +behavior can be modified using the --import-local option.</p></div> +<div class="paragraph"><p>The default <ref> is "master".</p></div> <div class="paragraph"><p>This example imports a new remote "p4/proj2" into an existing Git repository:</p></div> <div class="listingblock"> @@ -1643,7 +1644,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-02-05 21:07:26 PST +Last updated 2013-07-12 15:46:35 PDT </div> </div> </body>
diff --git a/git-p4.txt b/git-p4.txt index c579fbc..8cba16d 100644 --- a/git-p4.txt +++ b/git-p4.txt
@@ -176,13 +176,16 @@ These options can be used in the initial 'clone' as well as in subsequent 'sync' operations. ---branch <branch>:: - Import changes into given branch. If the branch starts with - 'refs/', it will be used as is. Otherwise if it does not start - with 'p4/', that prefix is added. The branch is assumed to - name a remote tracking, but this can be modified using - '--import-local', or by giving a full ref name. The default - branch is 'master'. +--branch <ref>:: + Import changes into <ref> instead of refs/remotes/p4/master. + If <ref> starts with refs/, it is used as is. Otherwise, if + it does not start with p4/, that prefix is added. ++ +By default a <ref> not starting with refs/ is treated as the +name of a remote-tracking branch (under refs/remotes/). This +behavior can be modified using the --import-local option. ++ +The default <ref> is "master". + This example imports a new remote "p4/proj2" into an existing Git repository:
diff --git a/git-pull.html b/git-pull.html index 84e17aa..17afbf8 100644 --- a/git-pull.html +++ b/git-pull.html
@@ -737,7 +737,7 @@ <h2>NAME</h2> <div class="sectionbody"> <p>git-pull - - Fetch from and merge with another repository or a local branch + Fetch from and integrate with another repository or a local branch </p> </div> </div> @@ -1884,7 +1884,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-03-27 15:10:17 PDT +Last updated 2013-07-12 15:46:35 PDT </div> </div> </body>
diff --git a/git-pull.txt b/git-pull.txt index 24ab07a..6ef8d59 100644 --- a/git-pull.txt +++ b/git-pull.txt
@@ -3,7 +3,7 @@ NAME ---- -git-pull - Fetch from and merge with another repository or a local branch +git-pull - Fetch from and integrate with another repository or a local branch SYNOPSIS
diff --git a/git-submodule.html b/git-submodule.html index 045a97b..5e7650b 100644 --- a/git-submodule.html +++ b/git-submodule.html
@@ -1075,7 +1075,7 @@ <p> This option is only valid for the update command. Instead of using the superproject’s recorded SHA-1 to update the submodule, use the - status of the submodule’s remote tracking branch. The remote used + status of the submodule’s remote-tracking branch. The remote used is branch’s remote (<code>branch.<name>.remote</code>), defaulting to <code>origin</code>. The remote branch used defaults to <code>master</code>, but the branch name may be overridden by setting the <code>submodule.<name>.branch</code> option in @@ -1209,7 +1209,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-05-17 16:33:07 PDT +Last updated 2013-07-12 15:46:35 PDT </div> </div> </body>
diff --git a/git-submodule.txt b/git-submodule.txt index e576713..bfff090 100644 --- a/git-submodule.txt +++ b/git-submodule.txt
@@ -262,7 +262,7 @@ --remote:: This option is only valid for the update command. Instead of using the superproject's recorded SHA-1 to update the submodule, use the - status of the submodule's remote tracking branch. The remote used + status of the submodule's remote-tracking branch. The remote used is branch's remote (`branch.<name>.remote`), defaulting to `origin`. The remote branch used defaults to `master`, but the branch name may be overridden by setting the `submodule.<name>.branch` option in
diff --git a/git.html b/git.html index cc721ba..af3d7c6 100644 --- a/git.html +++ b/git.html
@@ -1148,7 +1148,7 @@ </dt> <dd> <p> - Fetch from and merge with another repository or a local branch. + Fetch from and integrate with another repository or a local branch. </p> </dd> <dt class="hdlist1"> @@ -2765,7 +2765,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-06-20 16:38:52 PDT +Last updated 2013-06-28 15:14:40 PDT </div> </div> </body>
diff --git a/gitglossary.html b/gitglossary.html index 9a026d8..e719be1 100644 --- a/gitglossary.html +++ b/gitglossary.html
@@ -945,7 +945,7 @@ while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information <em>about</em> the current branch (e.g. <code>git -branch --set-upstream-to</code> that sets what remote tracking branch the +branch --set-upstream-to</code> that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state.</p></div> </dd> @@ -1221,7 +1221,7 @@ The default upstream <a href="#def_repository">repository</a>. Most projects have at least one upstream project which they track. By default <em>origin</em> is used for that purpose. New upstream updates - will be fetched into remote <a href="#def_remote_tracking_branch">remote-tracking branches</a> named + will be fetched into <a href="#def_remote_tracking_branch">remote-tracking branches</a> named origin/name-of-upstream-branch, which you can see using <code>git branch -r</code>. </p>
diff --git a/gitweb.conf.html b/gitweb.conf.html index 9f42bc5..ce9c789 100644 --- a/gitweb.conf.html +++ b/gitweb.conf.html
@@ -1132,11 +1132,36 @@ used as the first component of gitweb’s "breadcrumb trail": <code><home link> / <project> / <action></code>. Can be set at build time using the <code>GITWEB_HOME_LINK_STR</code> variable. By default it is set to "projects", - as this link leads to the list of projects. Other popular choice it to - set it to the name of site. + as this link leads to the list of projects. Another popular choice is to + set it to the name of site. Note that it is treated as raw HTML so it + should not be set from untrusted sources. </p> </dd> <dt class="hdlist1"> +@extra_breadcrumbs +</dt> +<dd> +<p> + Additional links to be added to the start of the breadcrumb trail before + the home link, to pages that are logically "above" the gitweb projects + list, such as the organization and department which host the gitweb + server. Each element of the list is a reference to an array, in which + element 0 is the link text (equivalent to <code>$home_link_str</code>) and element + 1 is the target URL (equivalent to <code>$home_link</code>). +</p> +<div class="paragraph"><p>For example, the following setting produces a breadcrumb trail like +"home / dev / projects / …" where "projects" is the home link.</p></div> +</dd> +</dl></div> +<div class="listingblock"> +<div class="content"> +<pre><code> our @extra_breadcrumbs = ( + [ 'home' => 'https://www.example.org/' ], + [ 'dev' => 'https://dev.example.org/' ], + );</code></pre> +</div></div> +<div class="dlist"><dl> +<dt class="hdlist1"> $logo_url </dt> <dt class="hdlist1"> @@ -1930,7 +1955,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2013-04-23 12:18:47 PDT +Last updated 2013-07-12 15:46:35 PDT </div> </div> </body>
diff --git a/gitweb.conf.txt b/gitweb.conf.txt index ea0526e..305db63 100644 --- a/gitweb.conf.txt +++ b/gitweb.conf.txt
@@ -336,8 +336,26 @@ used as the first component of gitweb's "breadcrumb trail": `<home link> / <project> / <action>`. Can be set at build time using the `GITWEB_HOME_LINK_STR` variable. By default it is set to "projects", - as this link leads to the list of projects. Other popular choice it to - set it to the name of site. + as this link leads to the list of projects. Another popular choice is to + set it to the name of site. Note that it is treated as raw HTML so it + should not be set from untrusted sources. + +@extra_breadcrumbs:: + Additional links to be added to the start of the breadcrumb trail before + the home link, to pages that are logically "above" the gitweb projects + list, such as the organization and department which host the gitweb + server. Each element of the list is a reference to an array, in which + element 0 is the link text (equivalent to `$home_link_str`) and element + 1 is the target URL (equivalent to `$home_link`). ++ +For example, the following setting produces a breadcrumb trail like +"home / dev / projects / ..." where "projects" is the home link. +---------------------------------------------------------------------------- + our @extra_breadcrumbs = ( + [ 'home' => 'https://www.example.org/' ], + [ 'dev' => 'https://dev.example.org/' ], + ); +---------------------------------------------------------------------------- $logo_url:: $logo_label::
diff --git a/glossary-content.txt b/glossary-content.txt index db2a74d..dba5062 100644 --- a/glossary-content.txt +++ b/glossary-content.txt
@@ -113,7 +113,7 @@ while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information _about_ the current branch (e.g. `git -branch --set-upstream-to` that sets what remote tracking branch the +branch --set-upstream-to` that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state. @@ -267,7 +267,7 @@ The default upstream <<def_repository,repository>>. Most projects have at least one upstream project which they track. By default 'origin' is used for that purpose. New upstream updates - will be fetched into remote <<def_remote_tracking_branch,remote-tracking branches>> named + will be fetched into <<def_remote_tracking_branch,remote-tracking branches>> named origin/name-of-upstream-branch, which you can see using `git branch -r`.
diff --git a/user-manual.html b/user-manual.html index 0adfd07..25278a9 100644 --- a/user-manual.html +++ b/user-manual.html
@@ -2069,7 +2069,7 @@ while the HEAD is detached. They update the HEAD to point at the tip of the updated history without affecting any branch. Commands that update or inquire information <span class="emphasis"><em>about</em></span> the current branch (e.g. <code class="literal">git -branch --set-upstream-to</code> that sets what remote tracking branch the +branch --set-upstream-to</code> that sets what remote-tracking branch the current branch integrates with) obviously do not work, as there is no (real) current branch to ask about in this state.</p></dd><dt><span class="term"> <a name="def_directory"></a>directory @@ -2244,7 +2244,7 @@ The default upstream <a class="link" href="#def_repository">repository</a>. Most projects have at least one upstream project which they track. By default <span class="emphasis"><em>origin</em></span> is used for that purpose. New upstream updates - will be fetched into remote <a class="link" href="#def_remote_tracking_branch">remote-tracking branches</a> named + will be fetched into <a class="link" href="#def_remote_tracking_branch">remote-tracking branches</a> named origin/name-of-upstream-branch, which you can see using <code class="literal">git branch -r</code>. </dd><dt><span class="term">
